@ehelms, where is ```@current_org``` set?  I don't understand that you are checking for @current_org.nil? but there is no ```else``` clause if @current_org is present.