Merge "Fix bug, change crashes to warnings"